Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 22:50:00 +0000 (14:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 22:50:00 +0000 (14:50 -0800)
commit2bc7f8f8625eb7928494fea87b8762b2debd4b52
treef47b52cb7ab0da4cf03a953a90b1461ef8bf93ff
parent77abbe5e6cc43f32ad636d4de3ea7fc71ff8881a
parent533af25c632ab3bd62663ca8270dcb0992e6b549
Merge from mainline.